csv fix from Alex.

diff --git a/csv_util.c b/csv_util.c
index 8f27c5f2fc7a8805bb0c00ca62156a7c5d7436a7..207c74a144257071929bf061dca6748925dda678 100644 (file)
--- a/csv_util.c
+++ b/csv_util.c
@@ -107,8 +107,9 @@ csv_stringtrim(const char *string, const char *enclosure)
 
     /* if we have enclosures, skip past them in pairs */
     if (elen) {
-       while ((strncmp(tmp, enclosure, elen) == 0)
-              && (strncmp(p2, enclosure, elen) == 0)) {
+       while (((p2 - p1) > elen) &&
+              (strncmp(p1, enclosure, elen) == 0) &&
+              (strncmp((p2 - elen + 1), enclosure, elen) == 0)) {
            p2 -= elen;
             p1 += elen;
        }